Properly fix #96638 #96823
Merged
Properly fix #96638 #96823
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
the
T-compiler
|
r? @estebank (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
b-naber
reviewed
May 9, 2022
jackh726
force-pushed
the
params-heuristics-fix
branch
from
4077f03 to
4599ce5
Compare
jackh726
force-pushed
the
params-heuristics-fix
branch
from
4599ce5 to
1d68e6d
Compare
|
@bors r+ |
|
📌 Commit 1d68e6d has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 10, 2022
Rollup of 5 pull requests Successful merges: - rust-lang#93661 (Add missing rustc arg docs) - rust-lang#96674 (docs: add link explaining variance to NonNull docs) - rust-lang#96812 (Do not lint on explicit outlives requirements from external macros.) - rust-lang#96823 (Properly fix rust-lang#96638) - rust-lang#96872 (make sure ScalarPair enums have ScalarPair variants; add some layout sanity checks) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #96638
The main part of this change is
Error::Invalidnow returns both the input and arg indices. However, I realized the code here was kind of confusing and not internally consistent (and thus I was having trouble getting the right behavior). So I've also switchedinput_indicesandarg_indicesto more closely match some naming inchecks(although I think a more thorough cleanup there could be beneficial). I've added comments, but essentiallyinput_indicesrefers to user provided inputs andarg_indicesrefers to expected args.